ir: move config options out of top level #3619
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
End-rey
requested review from
carpawell,
cthulhu-rider and
roman-khimov
as code owners
End-rey
force-pushed
the
3361-move-fschain_autodeploy-out-of-top-level
branch
from
da78f7f to
aef9c30
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3619 +/- ##
==========================================
+ Coverage 26.75% 26.79% +0.04%
==========================================
Files 653 653
Lines 51047 51111 +64
==========================================
+ Hits 13656 13697 +41
- Misses 36337 36362 +25
+ Partials 1054 1052 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
carpawell
reviewed
Oct 3, 2025
CHANGELOG.md
Outdated
| `neofs-adm fschain estimations` was removed. | ||
|
|
||
| Use new `fschain.disable_autodeploy` IR configuration option instead of deprecated `fschain_autodeploy`, | ||
| that was removed in next release. |
There was a problem hiding this comment.
mention that default value for the old config has changed?
There was a problem hiding this comment.
but in fact, i think it is useless work, we will just drop it in the next release, nobody gonna change this exact value in their configs, they will just use the new one
pkg/innerring/innerring.go
Outdated
|
|
||
| serveMetrics(server, cfg) | ||
|
|
||
| // TODO: remove deprecated option in future releases |
pkg/innerring/innerring.go
Outdated
| serveMetrics(server, cfg) | ||
|
|
||
| // TODO: remove deprecated option in future releases | ||
| if cfg.IsSet("fschain_autodeploy") && cfg.IsSet("fschain.disable_autodeploy") && |
There was a problem hiding this comment.
i think any case when both values are set can be reported as an error, this is smth abnormal to me
End-rey
force-pushed
the
3361-move-fschain_autodeploy-out-of-top-level
branch
from
aef9c30 to
1aff241
Compare
End-rey
changed the title
fschain_autodeploy out of top level
End-rey
force-pushed
the
3361-move-fschain_autodeploy-out-of-top-level
branch
from
1aff241 to
6f64aae
Compare
pkg/innerring/innerring.go
Outdated
| if cfg.IsSet("fee.main_chain") { | ||
| log.Warn("configuration option 'fee.main_chain' is deprecated, use 'mainnet.extra_fee' with the same value instead") | ||
| // default value | ||
| if cfg.Mainnet.ExtraFee == 50000000 { |
There was a problem hiding this comment.
default value may be specified in the config file explicitly. This will mutate it. We should be able to distinguish this case from Viper.SetDefault(), and return an error
| if cfg.IsSet("fschain_autodeploy") && cfg.IsSet("fschain.disable_autodeploy") { | ||
| return nil, fmt.Errorf("'fschain_autodeploy' and 'fschain.disable_autodeploy' set simultaneously") | ||
| } | ||
| if cfg.IsSet("fschain_autodeploy") { |
There was a problem hiding this comment.
may be merged with the previous if. Not a big deal taking into account further removal of both blocks
End-rey
force-pushed
the
3361-move-fschain_autodeploy-out-of-top-level
branch
from
6f64aae to
d8d0330
Compare
End-rey
force-pushed
the
3361-move-fschain_autodeploy-out-of-top-level
branch
from
d8d0330 to
0c9d9d1
Compare
Don't use viper's `SetDefault`, because it triggers configs `Set` and then we cannot determine whether this value was in the configuration or not. Signed-off-by: Andrey Butusov <[email protected]>
New `fschain.disable_autodeploy` IR configuration, which inverts the value of the `fschain_autodeploy` option. Make `fschain_autodeploy` default to `true`, support it for one more release. Closes #3361. Signed-off-by: Andrey Butusov <[email protected]>
End-rey
force-pushed
the
3361-move-fschain_autodeploy-out-of-top-level
branch
from
0c9d9d1 to
bf59214
Compare
`mainnet.enabled` IR configuration, which inverts the value of the `without_mainnet` option. By default, mainnet is disabled now. Ref #3362. Signed-off-by: Andrey Butusov <[email protected]>
Ref #3362. Signed-off-by: Andrey Butusov <[email protected]>
Ref #3362. Signed-off-by: Andrey Butusov <[email protected]>
Closes #3362. Signed-off-by: Andrey Butusov <[email protected]>
roman-khimov
approved these changes
Oct 16, 2025
roman-khimov
deleted the
3361-move-fschain_autodeploy-out-of-top-level
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #3361, #3362.